bitkeeper revision 1.1159.212.41 (41f6787aKvcI0-k3FYgkk8w74QD5gg)

manual merge.

diff --cc linux-2.4.29-xen-sparse/arch/xen/Makefile
Simple merge

diff --cc tools/Makefile
index 442c9317d0221fe0e62b9c329cb071ea9352afe9,907260707bda775bb4697bfcab48d3f6ce993dfd..4e590fd30bdabfd2dec5171891b6b2f20b378fac
--- 1/tools/Makefile
--- 2/tools/Makefile
+++ b/tools/Makefile
@@@ -8,13 -8,9 +8,11 @@@ all
        $(MAKE) -C xentrace
        $(MAKE) -C python
        $(MAKE) -C xfrd
 +      $(MAKE) -C xcs
 +      $(MAKE) -C ioemu
  
  install: 
- ifneq ($(dist),yes)
-       $(MAKE) -C check install
- endif
+       $(MAKE) -C check
        $(MAKE) -C libxutil install
        $(MAKE) -C libxc install
        $(MAKE) -C misc install
@@@ -23,12 -19,7 +21,9 @@@
        $(MAKE) -C python install
        $(MAKE) -C xfrd install
        $(MAKE) -C sv install
 +      $(MAKE) -C xcs install
 +      $(MAKE) -C ioemu install
  
- dist: $(TARGET)
-       $(MAKE) prefix=$(CURDIR)/../dist/install dist=yes install
- 
  clean:
        $(MAKE) -C libxutil clean
        $(MAKE) -C libxc clean

diff --cc tools/examples/Makefile
Simple merge

diff --cc tools/libxc/Makefile
Simple merge

diff --cc xen/Makefile
index 489f4d879195198a1c00f407901b9fd131e4d119,2a84ca6835df89e39b5d1bc07ed32781f7bf2887..f39634150c827c0e49320a1d19d0644558c829c7
--- 1/xen/Makefile
--- 2/xen/Makefile
+++ b/xen/Makefile
@@@ -4,12 -4,11 +4,11 @@@ INSTALL_DIR           = $(INSTALL) -d -m075
  
  # This is the correct place to edit the build version.
  # All other places this is stored (eg. compile.h) should be autogenerated.
 -export XEN_VERSION       = 2
 +export XEN_VERSION       = 3
  export XEN_SUBVERSION    = 0
 -export XEN_EXTRAVERSION  = ""
 +export XEN_EXTRAVERSION  = "-devel"
  
  export BASEDIR          := $(CURDIR)
- DESTDIR                       := $(CURDIR)/../dist/install
  
  include Rules.mk